Fixes layout parsing of operators
Merge pull request #763 from ahmadsalim/feature/parserlayoutfixes

Fixes layout parsing of operators