Fix 1994 routing issue