Fix Router 2.0