fixing things in router
fixing things in router