Quick hack to fix the keypress problem