Set collection bug fixing