 			
 			var fileName:String = getFlashVarFile().split("/").pop();
 			fileName = Weave.fixWeaveFileName(fileName, _useWeaveExtensionWhenSavingToServer);
+			if (!_firstTimeSaveToServer)
+				fileName=_previousFileNameStore;
 			
 			var fileSaveDialogBox:AlertTextBox;
 			fileSaveDialogBox = PopUpManager.createPopUp(this,AlertTextBox) as AlertTextBox;

		{
			if (event.confirm)
			{
				var fileName:String = event.textInput;
				fileName = Weave.fixWeaveFileName(fileName, _useWeaveExtensionWhenSavingToServer);
				
				var content:ByteArray;
				if (_useWeaveExtensionWhenSavingToServer)

	import weave.Weave;
	import weave.WeaveProperties;
	import weave.api.WeaveAPI;
	import weave.api.getCallbackCollection;
	import weave.api.reportError;
	import weave.api.core.ILinkableObject;
	import weave.api.data.ICSVExportable;
	import weave.api.data.IDataSource;
	import weave.api.ui.IVisTool;
	import weave.compiler.StandardLib;
	import weave.core.ExternalSessionStateInterface;
