Fixed bug in Router