fix routing mess