Bugfix on track.