Fixes #391

Sweet, sweet type coercion strikes again.
Merge pull request #392 from SpiderOak/issue-391-always-immediately

Fixes #391