NSM: work with pr #182