Bug fix in unsubscribe