Fix field reorder problem