Fix the last routing issue