Fixed unsubscribing not working