fixing unsubscription issue