diff --git a/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java b/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java
index 0b06fae312..2b6a1275b3 100644
--- a/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java
+++ b/org.adempiere.base/src/org/compiere/model/AttachmentFileSystem.java
@@ -204,7 +204,7 @@ public class AttachmentFileSystem implements IAttachmentStore {
 						log.severe("Error Reading The File.");
 						e1.printStackTrace();
 					}
-					final MAttachmentEntry entry = new MAttachmentEntry(filePath,
+					final MAttachmentEntry entry = new MAttachmentEntry(file.getName(),
 							dataEntry, attach.m_items.size() + 1);
 					attach.m_items.add(entry);
 				} else {