fixed unsubscribe