Fixed issue with order of routes