Untested attempt to fix crash with experimental NM.