Fix trackNumber key issue (#17)