Fix issue with Collection rendering