Buffer namespace connections

fixes #1213

I'll send a pull request anyway, though don't know whether this is a acceptable way to fix the problem.