Adapted to routing change.