Fix keys again