diff --git a/app/build.gradle b/app/build.gradle
index 4ec01dc6..0261994a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.0.2'
+    implementation 'com.simplemobiletools:commons:5.0.16'
 
     implementation files('../libs/RootTools.jar')
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
index bdee5655..cbb89dcd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
@@ -99,7 +99,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
 
     override fun getIsItemSelectable(position: Int) = true
 
-    override fun getItemSelectionKey(position: Int) = fileDirItems[position].path
+    override fun getItemSelectionKey(position: Int) = fileDirItems.getOrNull(position)?.path
 
     override fun getItemKeyPosition(key: String) = fileDirItems.indexOfFirst { it.path == key }
 
@@ -108,7 +108,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
         val fileDirItem = fileDirItems[position]
         holder.bindView(fileDirItem, true, true) { itemView, layoutPosition ->
-            setupView(itemView, fileDirItem, isKeySelected(fileDirItem.path))
+            setupView(itemView, fileDirItem)
         }
         bindViewHolder(holder)
     }
@@ -149,7 +149,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
     }
 
     private fun displayRenameDialog() {
-        val oldPath = getSelectedFileDirItems()[0].path
+        val oldPath = getFirstSelectedItemPath()
         RenameItemDialog(activity, oldPath) {
             activity.config.moveFavorite(oldPath, it)
             activity.runOnUiThread {
@@ -544,7 +544,8 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
         }
     }
 
-    private fun setupView(view: View, fileDirItem: FileDirItem, isSelected: Boolean) {
+    private fun setupView(view: View, fileDirItem: FileDirItem) {
+        val isSelected = isKeySelected(fileDirItem.path)
         view.apply {
             item_frame.isSelected = isSelected
             val fileName = fileDirItem.name
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
index 23219087..fedaee74 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
@@ -33,7 +33,7 @@ class ManageFavoritesAdapter(activity: BaseSimpleActivity, var favorites: ArrayL
 
     override fun getIsItemSelectable(position: Int) = true
 
-    override fun getItemSelectionKey(position: Int) = favorites[position]
+    override fun getItemSelectionKey(position: Int) = favorites.getOrNull(position)
 
     override fun getItemKeyPosition(key: String) = favorites.indexOfFirst { it == key }
 
diff --git a/build.gradle b/build.gradle
index 5aab4c3d..0b0dbc07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong