fixed unsubscribing