diff --git a/app/build.gradle b/app/build.gradle
index 80fe23f3e..1e3496d73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ ext {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.39.8'
+    compile 'com.simplemobiletools:commons:2.39.9'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.7.2'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     compile 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 6e1ffed01..45ef0b575 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -52,8 +52,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
         val layoutType = if (isListViewType) R.layout.directory_item_list else R.layout.directory_item_grid
-        val view = activity.layoutInflater.inflate(layoutType, parent, false)
-        return createViewHolder(view)
+        return createViewHolder(layoutType, parent)
     }
 
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
@@ -61,9 +60,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
         val view = holder.bindView(dir, !isPickIntent) {
             setupView(it, dir)
         }
-        itemViews.put(position, view)
-        toggleItemSelection(selectedPositions.contains(position), position)
-        holder.itemView.tag = holder
+        bindViewHolder(holder, position, view)
     }
 
     override fun getItemCount() = dirs.size
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index d922866c2..25839994a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -52,8 +52,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
 
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): ViewHolder {
         val layoutType = if (isListViewType) R.layout.photo_video_item_list else R.layout.photo_video_item_grid
-        val view = activity.layoutInflater.inflate(layoutType, parent, false)
-        return createViewHolder(view)
+        return createViewHolder(layoutType, parent)
     }
 
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
@@ -61,9 +60,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
         val view = holder.bindView(medium, !allowMultiplePicks) {
             setupView(it, medium)
         }
-        itemViews.put(position, view)
-        toggleItemSelection(selectedPositions.contains(position), position)
-        holder.itemView.tag = holder
+        bindViewHolder(holder, position, view)
     }
 
     override fun getItemCount() = media.size