fix keys again