Fixes #110
For real this time
Merge pull request #111 from SpiderOak/issue-110

Fix for #110