Flush instead of remember entities, and all is better !
Merge pull request #373 from Nek-/hot-fix/flush

Flush instead of remember entities, and all is better !