fixed keyhandler