Fixed bug with getting the wrong track