Fixed set_group if issue