Fix keys mapping