Attempt to fix broadcast