new routing support (fixed bug)