cloudinary
diff --git a/‎cloudinary-core/src/main/java/com/cloudinary/transformation/FetchLayer.java
Lines changed: 1 addition & 1 deletion b/‎cloudinary-core/src/main/java/com/cloudinary/transformation/FetchLayer.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java
Lines changed: 4 additions & 1 deletion b/‎cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java
Lines changed: 4 additions & 1 deletion
@@ -9,7 +9,7 @@ public FetchLayer() {
     }
 
     public FetchLayer url(String remoteUrl) {
-        this.publicId = Base64Coder.encodeString(remoteUrl);
+        this.publicId = Base64Coder.encodeURLSafeString(remoteUrl);;
         return this;
     }
 
 
@@ -1266,7 +1266,10 @@ public void testOverlayOptions() {
                 new FetchLayer().url("https://test"),
                 "fetch:aHR0cHM6Ly90ZXN0",
                 new FetchLayer().url("https://test").resourceType("video"),
-                "video:fetch:aHR0cHM6Ly90ZXN0"};
+                "video:fetch:aHR0cHM6Ly90ZXN0",
+                new FetchLayer().url("https://www.test.com/test/JE01118-YGP900_1_lar.jpg?version=432023"),
+                "fetch:aHR0cHM6Ly93d3cudGVzdC5jb20vdGVzdC9KRTAxMTE4LVlHUDkwMF8xX2xhci5qcGc_dmVyc2lvbj00MzIwMjM="
+        };
 
         for (int i = 0; i < tests.length; i += 2) {
             Object layer = tests[i];
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public FetchLayer() {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public FetchLayer url(String remoteUrl) {`
`12`		`- this.publicId = Base64Coder.encodeString(remoteUrl);`
	`12`	`+ this.publicId = Base64Coder.encodeURLSafeString(remoteUrl);;`
`13`	`13`	`return this;`
`14`	`14`	`}`
`15`	`15`