Fix bug reroute