Fix router order