diff --git a/LEGO1/gasstationstate.cpp b/LEGO1/gasstationstate.cpp
index 6172f773..ea141a81 100644
--- a/LEGO1/gasstationstate.cpp
+++ b/LEGO1/gasstationstate.cpp
@@ -1,5 +1,7 @@
 #include "gasstationstate.h"
 
+DECOMP_SIZE_ASSERT(GasStationState, 0x24);
+
 // OFFSET: LEGO1 0x10005eb0
 GasStationState::GasStationState()
 {
@@ -8,7 +10,9 @@ GasStationState::GasStationState()
   m_unk0x1c = 0;
   m_unk0x1e = 0;
   m_unk0x20 = 0;
-  m_unk0x08 = -1;
-  m_unk0x0c = -1;
-  m_unk0x10 = -1;
+
+  undefined4 *unk = m_unk0x08;
+  unk[0] = -1;
+  unk[1] = -1;
+  unk[2] = -1;
 }
diff --git a/LEGO1/gasstationstate.h b/LEGO1/gasstationstate.h
index d2803f07..a4a6c108 100644
--- a/LEGO1/gasstationstate.h
+++ b/LEGO1/gasstationstate.h
@@ -24,15 +24,13 @@ class GasStationState : public LegoState
   }
 
 private:
-  undefined4 m_unk0x08;
-  undefined4 m_unk0x0c;
-  undefined4 m_unk0x10;
+  undefined4 m_unk0x08[3];
   undefined4 m_unk0x14;
   undefined2 m_unk0x18;
   undefined2 m_unk0x1a;
   undefined2 m_unk0x1c;
   undefined2 m_unk0x1e;
-  undefined m_unk0x20;
+  undefined2 m_unk0x20;
 };
 
 #endif // GASSTATIONSTATE_H