fixed #144, special fields ordering