Another attempt to fix the collection loop issue