Fix Router 4.7