Fixes field ordering