fix problems with event broadcasting