Fix #730

Fix #730
Probably unit test doesn't pass, I don't know why, field order in JSON changes every time I run tests