routing bug fixes (again)