Fix ns term logic