fix handler
fix router