Fixed Router bug