Fixing accessing of invalid iterator in progress_app