Minor fix to keep the original field's type on the partial fields