fixed collection parsing