fix key entry handler