Fixed Routing Bug