Fixed bug with routing stuff