Make the ignore flush logic smarter