Added event model bug fix