Fix for group creation bug