Fix track keys bug