fix key issues