Fix bug with collection events before render

Fixes #1797 
Fixes #1794
![](http://www.cyberphysics.co.uk/topics/atomic/Accelerators/Cyclotron/cycfig.gif)