Merge pull request #644 from phire/invalid-field-order Implement the correct method for determining XFB field order.
