[BUGFIX] Routing issues