Merge branch 'fix/routing'

reviewed by @irxground