Fix for International Keyboard Support