Fix conversion of fields