Fixed broadcasting issues