Solve route issue