[BUGFIX] Routing bug