Fix bug on unsubscription