Router bug fix