Fix for eventId field in save data