Fixed events serialization