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