fix merge conflict
Merge branch 'localheinz-bugfixes/undefined-field'