Last track fix