@ochameau you still will need to check if listener is removed. I think we should make a followup patch te remove yield.