Get flush working more consistently