diff --git a/lib/WebGUI/Wobject/FileManager.pm b/lib/WebGUI/Wobject/FileManager.pm
index cc673f96c..24a62c2fc 100644
--- a/lib/WebGUI/Wobject/FileManager.pm
+++ b/lib/WebGUI/Wobject/FileManager.pm
@@ -235,14 +235,14 @@ sub www_editDownloadSave {
                 groupToView => $session{form}{groupToView}
                 });
 	$_[0]->reorderCollateral("FileManager_file","FileManager_fileId");
-        $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did});
+        $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"),$files{FileManager_fileId});
 	$file->save("downloadFile");
 	$files{downloadFile} = $file->getFilename;
 	$files{fileTitle} = $files{downloadFile} if ($session{form}{fileTitle} eq "");
-        $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did});
+        $file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"),$files{FileManager_fileId});
 	$file->save("alternateVersion1");
-	$files{alternateVersion1} = $file->getFilename;
-        $file = WebGUI::Attachment->new("",$session{form}{wid},$session{form}{did});
+		$files{alternateVersion1} = $file->getFilename;
+		$file = WebGUI::Attachment->new("",$_[0]->get("wobjectId"),$files{FileManager_fileId});
 	$file->save("alternateVersion2");
 	$files{alternateVersion2} = $file->getFilename;
 	$_[0]->setCollateral("FileManager_file", "FileManager_fileId", \%files);