Small fix for fields order