Fixed implementation in sending broadcasts