Fixed saving in S1