Event retrieval bug fix