Fixed issue with incorrect returned collection