fix compatibility of goolfc with HMNS