fixed bug for Event datamodel