Fix Router 3.2