fixed router bugs