Fixed track count bug