[#112470] Changes to fix routing
Merge pull request #17 from moiarcsan/master

[#112470] Changes to fix routing