field parsing bugfix
Merge origin/master