Keys fix