Fix field ordering error