Fixes bug in Calculator where track_count wasn't getting decremented