We're probably calling the server more than once with this call and the previous call to '_resolve_group', which wasn't happening with the previous implementation. Is there a way we can avoid calling the server multiple times here?