diff --git a/field.qc b/field.qc
index 3fb61ef..3c9c735 100644
--- a/field.qc
+++ b/field.qc
@@ -141,7 +141,8 @@ void() Field_think =
 	if (IsValidFieldGen(self.demon_one))
 	if (self.demon_one.fieldgen_status == FIELDGEN_ISWORKING)
 		Field_MakeVisual(self);		   
-   
+
+#ifdef ALIGNED_FIELDGENS 
 	// checks for anything stuck in field :)
 	local entity te;
 	local float frange;
@@ -160,26 +161,18 @@ void() Field_think =
 		if (te.velocity == '0 0 0')
 //		if (!IsBuilding(te)) // no screwing with the buildings :)
 		if (te.classname != "force_field")
-#ifdef ALIGNED_FIELDGENS
 		if (EntsTouching2(te,self))
-#else
-# warning We do NOT have a test for being stuck in the field, so I am disabling it
-		if (0)
-#endif
 		{
-			local entity foo;
-			foo = testentitypos (te);
-			if (foo == self)
-			{
-				other = te;
-				deathmsg = DMSG_STUCK_FORCEFIELD; 
-				self.dmg = FIELDGEN_DMGINSIDE; // this gonna hurt
-				Field_touch_SUB();
-			}
+			other = te;
+			deathmsg = DMSG_STUCK_FORCEFIELD; 
+			self.dmg = FIELDGEN_DMGINSIDE; // this gonna hurt
+			Field_touch_SUB();
 		}
-
 		te = te.chain;
 	}
+#else
+# warning We do NOT have a test for being stuck in the field, so I am disabling it
+#endif
 };
 
 //=============================================================================================
@@ -569,7 +562,7 @@ void(entity gen1, entity gen2) Create_Field =
 	// already checked b4 on CanLink -> CanIdle
 	/*if (!IsValidFieldGen(gen1) || !IsValidFieldGen(gen2))
 		return;*/
-		
+
 	gen1.fieldgen_status = FIELDGEN_ISENABLED;
 	gen2.fieldgen_status = FIELDGEN_ISENABLED;
 
diff --git a/options.qc b/options.qc
index 26626a7..8edbbc9 100644
--- a/options.qc
+++ b/options.qc
@@ -12,7 +12,6 @@ Defines for the compilable options within TF.
 //#define BOTS			// doesn't do anything yet
 //#define DEMO_STUFF
 #define STATUSBAR
-#undef ALIGNED_FIELDGENS
 
 #pragma PROGS_DAT "qwprogs.dat"
 
diff --git a/options.qh b/options.qh
index c729040..0b8a3e7 100644
--- a/options.qh
+++ b/options.qh
@@ -12,6 +12,7 @@ Defines for the compilable options within TF.
 //#define BOTS			// doesn't do anything yet
 //#define DEMO_STUFF
 #define STATUSBAR
+#undef ALIGNED_FIELDGENS
 
 //#pragma PROGS_DAT "qwprogs.dat"