Fix save-and-add functionality