Fix bug with collection events before render

Fixes #1797 
Fixes #1794
scratch that based on this: https://gist.github.com/samccone/224b6eef47a42e6a89fc