bug fix on includeNA