fix Issue 8738 - Struct literal breaks assigment ordering
Merge pull request #3557 from 9rnsr/fix8738

Issue 8738 - Struct literal breaks assigment ordering