Merge pull request #667 from jskeet/fix-field-orderings

Fix trivial bug in field orderings.