addFieldsSimple logic fix