Fix keys problem