Added fix for event deserialization