Fixing issue on joystick buttons