Simplify key fix