Fixing event saving