KRACOEUS-7095: fixing routing
Merge pull request #137 from leoherbie/fix_routing2

KRACOEUS-7095: fixing routing