diff --git a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
index d7c74f1..daa1c20 100644
--- a/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
+++ b/src/main/java/org/gcube/portlets/widgets/workspaceuploader/server/WorkspaceUploadServletStream.java
@@ -494,7 +494,6 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 			inputStream.addListener(uploadProgressListener);
 			workspaceUploader.setUploadProgress(uploadProgressListener.getUploadProgress());
 
-
 			//USING isOverwrite to check if the file already exists
 			try {
 				isOverwrite = storageHubWrapper.getWorkspace().exists(itemName, destinationFolder.getId());
@@ -528,10 +527,8 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 				if (isSupportedArchive){ //Uploading Archive OK
 
 					logger.debug("Supported archive " +uploadItem.getContentType() +" for unpacking");
-					workspaceUploader = WorkspaceUploaderMng.uploadArchive(storageHubWrapper, user, scopeGroupId, workspaceUploader, request, itemName, inputStream, destinationFolder, size);
-//					if (MimeTypeUtil.isZipContentType(uploadItem.getContentType())){ //UNZIP??
-//						logger.debug("Unziping content");
-//						//THE WORKSPACE HAS BEEN INSTANCIED ABOVE
+					//USING the baseName instead of itemName in oder to avoid adding extension as suffix
+					workspaceUploader = WorkspaceUploaderMng.uploadArchive(storageHubWrapper, user, scopeGroupId, workspaceUploader, request, baseName, inputStream, destinationFolder, size);
 
 					if(workspaceUploader==null)
 						throw new Exception("Error when creating uploader, it is null!");