Investigate getting stuck at end of tracks

This can only be resolved by restarting