Fix for buffer not stopping when unsubscribed.
Merge pull request #596 from akarnokd/BufferFix1

Fix for buffer not stopping when unsubscribed.