Fix stack-groups