Fix to progress tracking