Fix support for Gamepad control