Fixed issue with collection rendering