Routing bug fix