diff --git a/Assets/dll/puae.wbx.zst b/Assets/dll/puae.wbx.zst
index 86c26ad01e4..4ac2e67cbb6 100644
Binary files a/Assets/dll/puae.wbx.zst and b/Assets/dll/puae.wbx.zst differ
diff --git a/waterbox/uae/bizhawk.c b/waterbox/uae/bizhawk.c
index 04e0030ee5f..57876ffc220 100644
--- a/waterbox/uae/bizhawk.c
+++ b/waterbox/uae/bizhawk.c
@@ -48,16 +48,20 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo* f)
 		switch (controller->Type)
 		{
 			case CONTROLLER_JOYSTICK:
-				setjoystickstate(port, AXIS_VERTICAL,   controller->Buttons.up    ? JOY_MIN :
-														controller->Buttons.down  ? JOY_MAX : JOY_MID, 1);
-				setjoystickstate(port, AXIS_HORIZONTAL, controller->Buttons.left  ? JOY_MIN :
-														controller->Buttons.right ? JOY_MAX : JOY_MID, 1);
-				setjoybuttonstate(port, JOYBUTTON_1, controller->Buttons.b1);
-				setjoybuttonstate(port, JOYBUTTON_2, controller->Buttons.b2);
-				setjoybuttonstate(port, JOYBUTTON_3, controller->Buttons.b3);
+				setjoystickstate(0, AXIS_VERTICAL,   controller->Buttons.up    ? JOY_MIN :
+													 controller->Buttons.down  ? JOY_MAX : JOY_MID, 1);
+				setjoystickstate(0, AXIS_HORIZONTAL, controller->Buttons.left  ? JOY_MIN :
+													 controller->Buttons.right ? JOY_MAX : JOY_MID, 1);
+				setjoybuttonstate(0, JOYBUTTON_1, controller->Buttons.b1);
+				setjoybuttonstate(0, JOYBUTTON_2, controller->Buttons.b2);
+				setjoybuttonstate(0, JOYBUTTON_3, controller->Buttons.b3);
 				break;
 			case CONTROLLER_CD32PAD:
 				cd32_pad_enabled[port] = 1;
+				setjoystickstate(0, AXIS_VERTICAL,   controller->Buttons.up    ? JOY_MIN :
+													 controller->Buttons.down  ? JOY_MAX : JOY_MID, 1);
+				setjoystickstate(0, AXIS_HORIZONTAL, controller->Buttons.left  ? JOY_MIN :
+													 controller->Buttons.right ? JOY_MAX : JOY_MID, 1);
 				SetCD32ButtonState(port, JOYBUTTON_CD32_PLAY,   controller->Buttons.play);
 				SetCD32ButtonState(port, JOYBUTTON_CD32_RWD,    controller->Buttons.rewind);
 				SetCD32ButtonState(port, JOYBUTTON_CD32_FFW,    controller->Buttons.forward);
@@ -67,11 +71,11 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo* f)
 				SetCD32ButtonState(port, JOYBUTTON_CD32_BLUE,   controller->Buttons.blue);
 				break;
 			case CONTROLLER_MOUSE:
-				setmousestate(port, AXIS_HORIZONTAL, controller->MouseX - last_mouse_x[port], MOUSE_RELATIVE);
-				setmousestate(port, AXIS_VERTICAL,   controller->MouseY - last_mouse_y[port], MOUSE_RELATIVE);
-				setmousebuttonstate(port, MOUSE_LEFT,   controller->Buttons.b1);
-				setmousebuttonstate(port, MOUSE_RIGHT,  controller->Buttons.b2);
-				setmousebuttonstate(port, MOUSE_MIDDLE, controller->Buttons.b3);
+				setmousestate(0, AXIS_HORIZONTAL, controller->MouseX - last_mouse_x[port], MOUSE_RELATIVE);
+				setmousestate(0, AXIS_VERTICAL,   controller->MouseY - last_mouse_y[port], MOUSE_RELATIVE);
+				setmousebuttonstate(0, MOUSE_LEFT,   controller->Buttons.b1);
+				setmousebuttonstate(0, MOUSE_RIGHT,  controller->Buttons.b2);
+				setmousebuttonstate(0, MOUSE_MIDDLE, controller->Buttons.b3);
 				break;
 		}
 	}