Fix field order