diff --git a/osd.c b/osd.c
index e32df27..48d6df1 100644
--- a/osd.c
+++ b/osd.c
@@ -826,13 +826,8 @@ unsigned int OsdUsbVidGetB() {
 unsigned int OsdUsbPidGetB() {
 	return usb_pid_b;
 }
-/* return Joy state including turbo settings */
-uint8_t OsdJoyState ( uint8_t joy_num ) {
-	if(joy_num>1) return 0;
-	uint8_t result = mist_joy[joy_num].state;
-	if(mist_joy[joy_num].turbo==0) return result;
-	result &=  mist_joy[joy_num].turbo_state;
-	return result;
+unsigned int OsdUsbGetNumButtonsB() {
+	return num_buttons_b;
 }
 
 /* keyboard data */
diff --git a/osd.h b/osd.h
index 3d45d7e..4b1d764 100644
--- a/osd.h
+++ b/osd.h
@@ -150,7 +150,7 @@ unsigned char OsdJoyGetExtra2();
 
 // Keep track of connected sticks
 unsigned char OsdNumJoysticks();
-unsigned char OsdNumJoysticksSet(unsigned char num);
+void OsdNumJoysticksSet(unsigned char num);
 
 // USB raw data for joystick 1
 void OsdUsbJoySet(uint8_t usbjoy, uint8_t usbextra);
diff --git a/user_io.c b/user_io.c
index 4fb28d7..3f26821 100644
--- a/user_io.c
+++ b/user_io.c
@@ -329,12 +329,12 @@ void user_io_digital_joystick(unsigned char joystick, unsigned char map) {
 		// (mouse port)
 		
 	if (joystick==1) {
-		OsdJoySet(map, 0);
+		OsdJoySet(map);
 		//OsdTurboUpdate(0);
 		//map = (unsigned char)OsdJoyState(0); //apply turbo
 	}
 	else if (joystick==0) {// WARNING: 0 is the second joystick, either USB or DB9
-		OsdJoySet(map, 1);
+		OsdJoySet2(map);
 		//OsdTurboUpdate(1);
 		//map = (unsigned char)OsdJoyState(1); //apply turbo
 	}