diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt
index b619c49a2..cba9dd666 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/AbstractGalleryInfo.kt
@@ -12,7 +12,7 @@ interface AbstractGalleryInfo {
     var disowned: Boolean
     var rating: Float
     var rated: Boolean
-    var simpleTags: Array<String>?
+    var simpleTags: ArrayList<String>?
     var pages: Int
     var thumbWidth: Int
     var thumbHeight: Int
diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt
index 6f0021e8d..c420613ad 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/BaseGalleryInfo.kt
@@ -57,7 +57,7 @@ open class BaseGalleryInfo(
     override var rated: Boolean = false,
 
     @Ignore
-    override var simpleTags: Array<String>? = null,
+    override var simpleTags: ArrayList<String>? = null,
 
     @Ignore
     override var pages: Int = 0,
diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt
index 43c13d1d5..0caa8d312 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/data/GalleryInfo.kt
@@ -24,7 +24,7 @@ interface GalleryInfo : AbstractGalleryInfo, Parcelable {
             ?: title?.let { generateSLangFromTitle(it) }
     }
 
-    private fun generateSLangFromTags(simpleTags: Array<String>): String? {
+    private fun generateSLangFromTags(simpleTags: List<String>): String? {
         for (tag in simpleTags) {
             for (i in S_LANGS.indices) {
                 if (S_LANG_TAGS[i] == tag) {
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt
index 88fb142c8..103369d58 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryApiParser.kt
@@ -40,7 +40,7 @@ object GalleryApiParser {
             gi.rating = NumberUtils.parseFloatSafely(g.getString("rating"), 0.0f)
             // tags
             val tagJa = g.getJSONArray("tags")
-            gi.simpleTags = (0 until tagJa.length()).map { tagJa.getString(it) }.toTypedArray()
+            gi.simpleTags = (0 until tagJa.length()).map { tagJa.getString(it) }.let { arrayListOf<String>().apply { addAll(it) } }
             gi.pages = NumberUtils.parseIntSafely(g.getString("filecount"), 0)
             gi.generateSLang()
         }
diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt
index 92d4bb0fd..340e4892c 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryListParser.kt
@@ -127,7 +127,7 @@ object GalleryListParser {
             for (gt in gts) {
                 tags.add(gt.attr("title"))
             }
-            gi.simpleTags = tags.toTypedArray()
+            gi.simpleTags = tags
         }
 
         // Category