collection generator fix