fix event unsubscription