Fixed issue #20: Irregular Field Mapping Fatal Bug

Merged username-removed-187712 requested to merge bugfix/Issue#20 into develop