Fix Router 3.2.2