Fixed saving of System values