Long-running operation fix