Bug fix: flushes were being queued up inappropriately