fix the routing issue