Fixed protection against creating duplicate attributes