Flush minor bug resolve