Fix #1369 : Retrieve fields by structure order
Merge pull request #539 from romainneutron/fix-1369

[3.8] Fix #1369 : Retrieve fields by structure order