fix routing events