Fix of save