Fix Router 3.9.4