Fix subscription and unsubscription