Keyhandler fix