Fixes multiple updates on multiple flush executions
Merge pull request #546 from bobvandevijver/master

Fixes multiple updates on multiple flush executions