Fix Router 2.1