fixed bug with fields order