fix router issues