also fix the issue for regular groups