Fix to the save method