Router bug fixed