Fixed Track Controller issue