Fix Router 4.2