fix routing problems