Fix progress handling