Fixed the routing