Added protection from saving same event ID