Fix for track jumping