Fixed recursion on router bug