Fix field order issue