Fix Beacon broadcasting