Fix group creation