bug fiexes in router