Fixed event saving bug