Router strategy fix