Fixing bug in unsubscribe