BugFix: losing data during save event procedure