Fix for Joystick Setup Swapping