Issue with leaking broadcast seems to be solved.