diff --git a/menu.c b/menu.c
index 8b2ed2d..a6765ae 100644
--- a/menu.c
+++ b/menu.c
@@ -1444,8 +1444,10 @@ void HandleUI(void)
 			OsdSetTitle("Turbo", 0);
 			menustate = MENU_8BIT_TURBO2;
 			parentstate=MENU_8BIT_TURBO1;
-			StateJoyState(0, &mist_joy[0]);
-			StateJoyState(1, &mist_joy[1]);
+			//StateJoyState(0, &mist_joy[0]);
+			joy0 = mist_joy[0];//StateJoyGet(0);
+			//StateJoyState(1, &mist_joy[1]);
+			joy1 = mist_joy[1];//StateJoyGet(1);
 			OsdWrite(0, "    Button Configuration", 1, 0);
 			OsdWrite(1, "", 0, 0);
 			strcpy(s,   "    Joy 1 Turbo     : ");
@@ -1465,8 +1467,10 @@ void HandleUI(void)
 			break;
 			
 		case MENU_8BIT_TURBO2:
-			StateJoyState(0, &mist_joy[0]);
-			StateJoyState(1, &mist_joy[1]);
+			//StateJoyState(0, &mist_joy[0]);
+			//StateJoyState(1, &mist_joy[1]);
+			joy0 = mist_joy[0];//StateJoyGet(0);
+			joy1 = mist_joy[1];//StateJoyGet(1);
 			strcpy(s,   "    Joy 1 Turbo     : ");
 			strcat(s, config_button_turbo_msg[(int)joy0.turbo/OSD_TURBO_STEP]);
 			OsdWrite(2, s, menusub==0, 0);
diff --git a/state.c b/state.c
index 0f3134f..fed77dc 100644
--- a/state.c
+++ b/state.c
@@ -62,7 +62,7 @@ void StateJoySetExtra(uint8_t c, uint8_t joy_num) {
 		if(joy_num==0) 
 		osd_joy_extra = c;
 	else
-		osd_joy_extra = c;
+		osd_joy_extra2 = c;
 }
 uint8_t StateJoyGet(uint8_t joy_num) {
   return joy_num==0?osd_joy:osd_joy2;
diff --git a/usb/hid.c b/usb/hid.c
index 40468c6..de11832 100644
--- a/usb/hid.c
+++ b/usb/hid.c
@@ -755,17 +755,18 @@ static void usb_process_iface (usb_hid_iface_info_t *iface,
 				
 				//if (jmap != 0) iprintf("JMAP post map:%d\n", jmap);
 				
-				// report joystick 1 to OSD
-				StateJoySetExtra( btn_extra, iface->jindex);
-				
+				// report joysticks to OSD
+				idx=iface->jindex;
+				StateJoySetExtra( btn_extra, idx);
 				// swap joystick 0 and 1 since 1 is the one 
 				// used primarily on most systems
 				
 				if(idx == 0)      idx = 1;
 				else if(idx == 1) idx = 0;
+				//StateJoySetExtra( btn_extra, idx); 
 				
 				// run even if not changed
-					user_io_digital_joystick(idx, jmap);
+				user_io_digital_joystick(idx, jmap);
 				
 				// also send analog values
 				user_io_analog_joystick(idx, a[0]-128, a[1]-128);