Fix bug with onRenderCollection call

Fixes #1503 
Fixes #1506  
very clever :tophat: