Fix collection bug