another routing fix
internal routing optimization