diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
index 48a685174..8a9e843b0 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -152,7 +152,7 @@ class EHentai(override val id: Long,
                         throttleFunc()
 
                         val resp = client.newCall(exGet(baseUrl + url)).execute()
-                        if (!resp.isSuccessful) error("HTTP error (${resp.code})!")
+                        if (!resp.isSuccessful) break //error("HTTP error (${resp.code})!")
                         doc = resp.asJsoup()
 
                         val parentLink = doc!!.select("#gdd .gdt1").find { el ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
index 56ecb973f..367f6fcc7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
@@ -336,7 +336,7 @@ class Hitomi : HttpSource(), LewdSource<HitomiSearchMetadata, Document>, UrlImpo
     }
 
     override fun pageListRequest(chapter: SChapter): Request {
-        return GET("$LTN_BASE_URL/manga/${HitomiSearchMetadata.hlIdFromUrl(chapter.url)}.js")
+        return GET("$LTN_BASE_URL/galleries/${HitomiSearchMetadata.hlIdFromUrl(chapter.url)}.js")
     }
 
     /**
@@ -362,11 +362,14 @@ class Hitomi : HttpSource(), LewdSource<HitomiSearchMetadata, Document>, UrlImpo
         val hlId = response.request.url.pathSegments.last().removeSuffix(".js").toLong()
         val str = response.body!!.string()
         val json = jsonParser.parse(str.removePrefix("var galleryinfo ="))
-        return json.array.mapIndexed { index, jsonElement ->
+        return json.array.mapIndexed { index, jsonElement -> 
+            val hash = jsonElement["hash"].string
+            val hashPath1 = hash.takeLast(1)
+            val hashPath2 = hash.takeLast(3).take(2)
             Page(
                     index,
                     "",
-            "https://${subdomainFromGalleryId(hlId)}a.hitomi.la/manga/$hlId/${jsonElement["name"].string}"
+            "https://${subdomainFromGalleryId(hlId)}a.hitomi.la/webp/$hashPath1/$hashPath2/$hash.webp"
             )
         }
     }
diff --git a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt
index c5befa759..985e3e2d4 100644
--- a/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt
+++ b/app/src/main/java/exh/metadata/metadata/HitomiSearchMetadata.kt
@@ -93,9 +93,9 @@ class HitomiSearchMetadata: RaisedSearchMetadata() {
         const val BASE_URL = "https://hitomi.la"
 
         fun hlIdFromUrl(url: String)
-                = url.split('/').last().substringBeforeLast('.')
+                = url.split('/').last().split('-').last().substringBeforeLast('.')
 
         fun urlFromHlId(id: String)
                 = "$BASE_URL/galleries/$id.html"
     }
-}
\ No newline at end of file
+}