added fixes on broadcast