Fix flushing