Fix event transmitter mechanism