Fixed the routing bug
one more bug