fix na logic some