Fix Router 3.0