fixes #2 issue: order of fields