Another NSM fix