Fix router bug