Hopeful fix for cancellation race condition