router: fix initial handling