Fixed data issue for no events