more routing fix...really must be the final :(