Fixes #358
Merge pull request #518 from twitter/thenFix

Fixes #358