collection bug fixes