Fixed the group commands