Minor change to the way key frames are selected