Merge pull request #1318 from jpereira/bug/nas_type