Fix 22tracks double skippage again