Fix saving finished events