Fix bug event save