fix fields order