First cut at fix for group creation problem