FIx unsubscribing events