Added a fix for track switching...