406390 406617 removed tiny race from handling of suspend and complete