diff --git a/src_rebuild/EMULATOR/LIBPAD.C b/src_rebuild/EMULATOR/LIBPAD.C
index a8404c22..65fe807f 100644
--- a/src_rebuild/EMULATOR/LIBPAD.C
+++ b/src_rebuild/EMULATOR/LIBPAD.C
@@ -360,10 +360,10 @@ void InternalPadUpdates()
 				pad->status = 0;	// PadStateStable?
 
 				// switch to analog state
-				if(pad->analog[0] == 255 || 
+				if((pad->analog[0] == 255 || 
 					pad->analog[1] == 255 || 
 					pad->analog[2] == 255 || 
-					pad->analog[3] == 255 || 
+					pad->analog[3] == 255) && 
 					pad->id == 0x41)
 				{
 					eprintf("Switched controller type to ANALOG\n");