make some fix in routing