diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs
index ae4939b5ee..d140b329f2 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/GPGXControlConverter.cs
@@ -92,8 +92,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			ControllerDef.FloatRanges.Add(FullShort);
 			Converts.Add(delegate()
 			{
-				target.analog[idx,0] = (short)source.GetFloat(NX);
-				target.analog[idx,1] = (short)source.GetFloat(NY);
+				target.analog[(2*idx)+0] = (short)source.GetFloat(NX);
+				target.analog[(2*idx)+1] = (short)source.GetFloat(NY);
 			});
 		}
 
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs
index 0b77b57c80..c31ea0771b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx/LibGPGX.cs
@@ -215,7 +215,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 			/// analog (x/y)
 			/// </summary>
 			[MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEVICES * 2)]
-			public readonly short[,] analog = new short[MAX_DEVICES, 2];
+			public readonly short[] analog = new short[MAX_DEVICES * 2];
 			/// <summary>
 			/// gun horizontal offset
 			/// </summary>