Reorder Flush checks

Change-Id: I8b6b015c352c500af7cacfab226454c83f0a03d3