+ bugfix with track end