Fixed issue with Japanese / Chinese keyboards - Thanks @donobono