Fix saving in hardcore

Fix #2030