diff --git a/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java b/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
index a052d8457a41..e6c905bd25c9 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
@@ -165,7 +165,7 @@ public static Metadata retrieveMetadata (Item item) {
                     Element bitstream = create(factory, "bitstream");
                     bitstreams.getElement().add(bitstream);
                     String url = "";
-                    String bsName = bitstream.getName();
+                    String bsName = bit.getName();
                     String sid = String.valueOf(bit.getSequenceID());
                     String baseUrl = ConfigurationManager.getProperty("oai",
                             "bitstream.baseUrl");
@@ -190,7 +190,7 @@ public static Metadata retrieveMetadata (Item item) {
                     if (handle != null && baseUrl != null)
                     {
                         url = baseUrl + "/bitstream/"
-                                + URLUtils.encode(handle) + "/"
+                                + handle + "/"
                                 + sid + "/"
                                 + URLUtils.encode(bsName);
                     }