Bug fixed: Kept the fields ordered as requested