FIXED Flush issue