Corrected broadcast handling