Fix problem due to routes order