[ORB-239] Fixed ordering of fields