Fixed Bug: no events returned