fixed the routing mess