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 c284237..e2a5f25 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
@@ -484,11 +484,19 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 //		FileInputStream fis = null;
 //		BufferedInputStream bis = null;
 		try {
-			//we calculate an unique name for the current destination
+			//Removing path from fileName
 			String itemName = fileName;
-			itemName = FilenameUtils.getBaseName(itemName); //Using base name in order to avoid Task #12470
+			//Getting extension
+			String extension = FilenameUtils.getExtension(itemName);
+			logger.debug("extension: "+extension);
+			//Getting base name
+			String baseName = FilenameUtils.getBaseName(itemName); //Using base name in order to avoid Task #12470
+			itemName = baseName+"."+extension;
+			logger.debug("purged item name is: "+itemName);
+			//SIZE
+			Long size = getContentLength(request);
+			logger.debug("size: " + size + " bytes");
 
-			logger.debug("getItemName from HL");
 			/*if(!isOverwrite){
 				itemName = WorkspaceUtil.getUniqueName(fileName, destinationFolder);
 			}
@@ -509,9 +517,6 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 				}
 			}*/
 
-			Long size = getContentLength(request);
-			logger.debug("size: " + size + " bytes");
-
 			/*
 			String contentType = uploadItem.getContentType();
 			logger.debug("Content type (mime type): "+contentType + " unique name: "+itemName);
@@ -521,8 +526,6 @@ public class WorkspaceUploadServletStream extends HttpServlet implements Servlet
 				contentType = null;
 			}
 			*/
-			String extension = FilenameUtils.getExtension(itemName);
-			logger.debug("extension: "+extension);
 
 			//CONFIRM DESTINATION FOLDER
 			workspaceUploader.getFile().setParentId(destinationFolder.getId());