Fix collection bugs