Fixed collections even more