Fixing new keys