Collection criteria fix