coverage and critical bug fix in router