Correct regression around ?flush

?flush used to work. There's no reason why it shouldn't.
Merge pull request #3593 from simonwelsh/patch-1

Correct regression around ?flush