Fix issue with gamepad