Fix issue in legacy routing