Fix routing and bundle routing problem