diff --git a/OpenContent/Components/FileUploadController.cs b/OpenContent/Components/FileUploadController.cs
index 93f1d3bf..17ab3f58 100644
--- a/OpenContent/Components/FileUploadController.cs
+++ b/OpenContent/Components/FileUploadController.cs
@@ -194,7 +194,8 @@ private void UploadWholeFile(HttpContextBase context, ICollection<FilesStatus> s
                     if (!string.IsNullOrEmpty(context.Request.Form["hidden"]) && // cropped file
                         context.Request.Form["hidden"] == "true")
                     {
-                        uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + ActiveModule.ModuleID;
+                        //uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + ActiveModule.ModuleID;
+                        uploadfolder = "OpenContent/" + (secure ? "Secure" : "") + "Cropped/" + module.DataModule.ModuleId;
                         GetOrCreateFolder(secure, uploadfolder);
                         if (!string.IsNullOrEmpty(context.Request.Form["itemKey"]))
                         {
@@ -237,7 +238,7 @@ private void UploadWholeFile(HttpContextBase context, ICollection<FilesStatus> s
                     {
                         string uploadParentFolder = "OpenContent/" + (secure ? "Secure" : "") + "Files/";
                         GetOrCreateFolder(secure, uploadParentFolder);
-                        uploadfolder = uploadParentFolder + ActiveModule.ModuleID + "/";
+                        uploadfolder = uploadParentFolder + module.DataModule.ModuleId + "/";
                         if (module.Settings.Manifest.DeleteFiles)
                         {
                             if (!string.IsNullOrEmpty(context.Request.Form["itemKey"]))