Workaround for #52

Not the final solution. Better buffer strategy will be part of the
API redesign planned for the next couple of weeks, but not until after
the merge.

Closes #52