Bugfix for track change bug