fixing routing bugs