Eventing subsystem
Fixed empty queue issue