Fix for buffer not stopping when unsubscribed.

Issue #559