Joystick class is now more fail safe