more robust track handling