Fix bug with onRenderCollection call

Fixes #1503 
Fixes #1506
Fixes #1504
wow, many indentation, so spacing