Updated condition for unsubscribe