Fix Router 3.9