Fix Resolve operation not in progress, we are not resuming error