Fix Router 3.2.3
Fix Router 3.2.3