Fixed bug: group not properly set