Not always flush in callback
Merge pull request #926 from raven02/patch-4

Not always flush in callback