Possible fix for bug #821.
Merge pull request #1014 from basho/bug/am/821

Possible fix for bug #821.