fix routing for 2.2