handles unsubscribes better