Fix Router 4.4