Another attempt to fix collection re-rendering issue