Fix fields order problem caught by eclipse's Bug 300408.