Fix the routing system fix #6