fixing route order