Issue #11, Unsubscribe fix.