diff --git a/libretro.cpp b/libretro.cpp
index 993b1297..f4be54a6 100755
--- a/libretro.cpp
+++ b/libretro.cpp
@@ -3042,22 +3042,22 @@ void retro_set_controller_port_device(unsigned in_port, unsigned device)
       case RETRO_DEVICE_PS1PAD:
          if (log_cb)
             log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type standard gamepad.\n", MEDNAFEN_CORE_NAME);
-         SetInput(in_port, "gamepad", &input_buf[in_port]);    
+         SetInput(in_port, "gamepad", &buf.u8[in_port]);    
          break;
       case RETRO_DEVICE_DUALANALOG:
          if (log_cb)
             log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type Dual Analog.\n", MEDNAFEN_CORE_NAME);
-         SetInput(in_port, "dualanalog", &input_buf[in_port]);    
+         SetInput(in_port, "dualanalog", &buf.u8[in_port]);    
          break;
       case RETRO_DEVICE_DUALSHOCK:
          if (log_cb)
             log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type DualShock.\n", MEDNAFEN_CORE_NAME);
-         SetInput(in_port, "dualshock", &input_buf[in_port]);    
+         SetInput(in_port, "dualshock", &buf.u8[in_port]);    
          break;
       case RETRO_DEVICE_FLIGHTSTICK:
          if (log_cb)
             log_cb(RETRO_LOG_INFO, "[%s]: Selected controller type FlightStick.\n", MEDNAFEN_CORE_NAME);
-         SetInput(in_port, "analogjoy", &input_buf[in_port]);    
+         SetInput(in_port, "analogjoy", &buf.u8[in_port]);
          break;
       default:
          if (log_cb)
@@ -3101,12 +3101,12 @@ void retro_set_environment(retro_environment_t cb)
    static const struct retro_controller_info ports[] = {
       { pads, 4 },
       { pads, 4 },
-      { pads, 3 },
-      { pads, 3 },
-      { pads, 3 },
-      { pads, 3 },
-      { pads, 3 },
-      { pads, 3 },
+      { pads, 4 },
+      { pads, 4 },
+      { pads, 4 },
+      { pads, 4 },
+      { pads, 4 },
+      { pads, 4 },
       { 0 },
    };