Fix for joystick parsing (Thanks Kevin!)