Fix issue with field order #9