fix Router bugs