field ordering fix