hopefully this finally fixed the routing bug