bug fix routing