fixed routing bugs