Issue #2; fixed router