Proper fix of the save-saveas problem