Patch for #349

See issue: https://github.com/socketstream/socketstream/issues/349#commit-ref-d633d88