Fixed bug in LiveEventListener