fixing event broadcasting