Fix Router 3.7