Issue #99: an initial patch to ensure that we don't ever have data in our buffer, that isn't forwarded