fixed keys... again?