Protect against mapped underscore

Refs pull request #3