Fixing Group set bugs