Changed behaviour for resolving groups
2.0.0