fix na conflict.