Fixed problems with event distribution