[BUGFIX] Fix routing issue