Some patch magic to return puppet groups