Initial routing fix