Fixed router bug