Auto-detect tracks bug fix