fixes in routing