Fix subfield adding