diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
index 884d46dd..2fb4fd0e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
@@ -145,11 +145,8 @@ namespace PolyVox
 	class LargeVolume : public Volume<VoxelType>
 	{
 	public:
-#if defined(_MSC_VER) //DIRTY HACK!!!
-		class Sampler : public Volume<VoxelType>::Sampler< LargeVolume<VoxelType> >
-#else
-		class Sampler : public Volume<VoxelType>::template Sampler< LargeVolume<VoxelType> >
-#endif
+		typedef Volume<VoxelType> VolumeOfVoxelType; //Workaround for GCC/VS2010 differences. See http://goo.gl/qu1wn
+		class Sampler : public VolumeOfVoxelType::template Sampler< LargeVolume<VoxelType> >
 		{
 		public:
 			Sampler(LargeVolume<VoxelType>* volume);
diff --git a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h
index b2bee28c..d7d2b1bf 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/RawVolume.h
@@ -38,11 +38,8 @@ namespace PolyVox
 	{
 	public:
 		#ifndef SWIG
-#if defined(_MSC_VER) //DIRTY HACK!!!
-		class Sampler : public Volume<VoxelType>::Sampler< RawVolume<VoxelType> >
-#else
-		class Sampler : public Volume<VoxelType>::template Sampler< RawVolume<VoxelType> >
-#endif
+		typedef Volume<VoxelType> VolumeOfVoxelType; //Workaround for GCC/VS2010 differences. See http://goo.gl/qu1wn
+		class Sampler : public VolumeOfVoxelType::template Sampler< RawVolume<VoxelType> >
 		{
 		public:
 			Sampler(RawVolume<VoxelType>* volume);
diff --git a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
index b9284e11..b75cd367 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
@@ -60,11 +60,8 @@ namespace PolyVox
 			uint8_t m_uSideLengthPower;	
 		};
 
-#if defined(_MSC_VER) //DIRTY HACK!!!
-		class Sampler : public Volume<VoxelType>::Sampler< SimpleVolume<VoxelType> >
-#else
-		class Sampler : public Volume<VoxelType>::template Sampler< SimpleVolume<VoxelType> >
-#endif
+		typedef Volume<VoxelType> VolumeOfVoxelType; //Workaround for GCC/VS2010 differences. See http://goo.gl/qu1wn
+		class Sampler : public VolumeOfVoxelType::template Sampler< SimpleVolume<VoxelType> >
 		{
 		public:
 			Sampler(SimpleVolume<VoxelType>* volume);
diff --git a/tests/TestVolumeSubclass.cpp b/tests/TestVolumeSubclass.cpp
index dc6af74d..4ed1e4aa 100644
--- a/tests/TestVolumeSubclass.cpp
+++ b/tests/TestVolumeSubclass.cpp
@@ -37,21 +37,17 @@ template <typename VoxelType>
 class VolumeSubclass : public Volume<VoxelType>
 {
 public:
-
-#if defined(_MSC_VER) //DIRTY HACK!!!
-		class Sampler : public Volume<VoxelType>::Sampler< VolumeSubclass<VoxelType> >
-#else
-		class Sampler : public Volume<VoxelType>::template Sampler< VolumeSubclass<VoxelType> >
-#endif
+	typedef Volume<VoxelType> VolumeOfVoxelType; //Workaround for GCC/VS2010 differences. See http://goo.gl/qu1wn
+	class Sampler : public VolumeOfVoxelType::template Sampler< VolumeSubclass<VoxelType> >
+	{
+	public:
+		Sampler(VolumeSubclass<VoxelType>* volume)
+			:Volume<VoxelType>::template Sampler< VolumeSubclass<VoxelType> >(volume)
 		{
-		public:
-			Sampler(VolumeSubclass<VoxelType>* volume)
-				:Volume<VoxelType>::template Sampler< VolumeSubclass<VoxelType> >(volume)
-			{
-				this->mVolume = volume;
-			}
-			//~Sampler();
-		};
+			this->mVolume = volume;
+		}
+		//~Sampler();
+	};
 
 	/// Constructor for creating a fixed size volume.
 	VolumeSubclass(const Region& regValid)