Fixed a bug introduced in latest commit that broke the routing system