Fixed #5 - switch joystick/orientation head control