Fix Router 2.2