router some fix