Router: fixed bugs