Fix in internal routing