diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt
index 10bdac01ecef..8bfcd35e1f53 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelper.kt
@@ -63,11 +63,11 @@ fun getImageUrl(barcode: Barcode, imageName: String, size: String): String {
         else buildString {
             append(rawBarcode.substring(0, 3))
             append("/")
-            append(rawBarcode.substring(3, 7))
+            append(rawBarcode.substring(3, 6))
             append("/")
-            append(rawBarcode.substring(7, 11))
+            append(rawBarcode.substring(6, 9))
             append("/")
-            append(rawBarcode.substring(11))
+            append(rawBarcode.substring(9))
         }
 
     return "$BASE_IMAGES_URL/$barcodePattern/$imageName.$size.jpg"
diff --git a/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt b/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt
index 384959c2aa0d..5b5205281c83 100644
--- a/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt
+++ b/app/src/test/java/openfoodfacts/github/scrachx/openfood/images/ImageKeyHelperTest.kt
@@ -5,6 +5,7 @@ import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
 import openfoodfacts.github.scrachx.openfood.BuildConfig
+import openfoodfacts.github.scrachx.openfood.models.Barcode
 import openfoodfacts.github.scrachx.openfood.models.Product
 import openfoodfacts.github.scrachx.openfood.models.ProductImageField
 import org.junit.jupiter.api.Test
@@ -34,7 +35,7 @@ class ImageKeyHelperTest {
 
     @Test
     fun imageUrl_BarcodeShorter() {
-        val barcode = "303371"
+        val barcode = Barcode("303371")
         val imageName = "123"
         val size = "987"
         val expected = BuildConfig.STATICURL + "/images/products/303371/123.987.jpg"
@@ -43,7 +44,7 @@ class ImageKeyHelperTest {
 
     @Test
     fun imageUrl_BarcodeLonger() {
-        val barcode = "3033710001279"
+        val barcode = Barcode("3033710001279")
         val imageName = "123"
         val size = "987"
         val expected = BuildConfig.STATICURL + "/images/products/303/371/000/1279/123.987.jpg"