Fixed bug with router