Fix for group creation problem