Fixing bugs with current progress finder.