Another change to joypad behaviour