similar fix to the race condition around handlers and progress notifications