Routing hotfix