Xray nested iteration have incorrect fields to retrieve

On nested iterations of Xray mappings, the fields to retrieve aren't well split by iteration level.
The first level of iteration will load the correct values, but the next levels of iteration will always load the fields from the first level.

Example:

${Description}
#{for testruns}
A - ${TestRuns[n].Key} 
#{for r=TestRuns[n].TestStepsCount}
B - ${TestRuns[n].TestSteps[r].Key}
#{for dc=TestRuns[n].TestSteps[r].DefectsCount} 
C - ${TestRuns[n].TestSteps[r].Defects[dc].Key}
${TestRuns[n].TestSteps[r].Defects[dc].Description}
#{end}
#{end}
#{end}

In the above example, the retrieved fields for iteration is as follows: