Fix Router 4.5