Fix collection parsing issue