fix problem with event broadcasting