Flush more correctly