Finally fixed the routing