Fix: Undefined field
Merge pull request #75 from localheinz/bugfix/undefined-field

Fix: Field is undefined
Merge branch 'hotfix/75' into develop

Forward port #75