diff --git a/src/Dodge/Data/Machine.hs b/src/Dodge/Data/Machine.hs
index 38efcffe4..fecfad67d 100644
--- a/src/Dodge/Data/Machine.hs
+++ b/src/Dodge/Data/Machine.hs
@@ -45,14 +45,16 @@ data Machine = Machine
     , _mcCloseSound :: Maybe SoundID
     , _mcWidth :: Float
     }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read, Generic)
+    --hderiving (Eq, Show, Read, Generic, Flat)
 
 data MachineType
     = McStatic
     | McTerminal
     | McSensor Sensor
     | McTurret Turret
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read, Generic)
+    --hderiving (Eq, Show, Read, Generic, Flat)
 
 data Turret = Turret
     { _tuWeapon :: Item
@@ -60,7 +62,8 @@ data Turret = Turret
     , _tuFireTime :: Int
     , _tuDir :: Float
     }
-    deriving (Eq, Show, Read, Generic, Flat)
+    deriving (Eq, Show, Read, Generic)
+    --hderiving (Eq, Show, Read, Generic, Flat)
 
 makeLenses ''Machine
 makeLenses ''Turret