Default routing fix