maybe fixed router bug