Fix flush logic - take 2

Fix for docker/fig/pull/561

I guess the timeout was masking this being broken.