diff --git a/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt b/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
index 0a1a0be..8d06a28 100644
--- a/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
@@ -50,6 +50,7 @@ class OmapiApduInterface(
         check(channel != null) {
             "Invalid logical channel handle $handle"
         }
+        channels.remove(handle)
         channel.close()
     }
 
diff --git a/app-common/src/main/java/im/angry/openeuicc/vendored/simlink.kt b/app-common/src/main/java/im/angry/openeuicc/vendored/simlink.kt
index 013f07c..89641ac 100644
--- a/app-common/src/main/java/im/angry/openeuicc/vendored/simlink.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/vendored/simlink.kt
@@ -8,11 +8,11 @@ fun getSIMLinkVersion(eid: String, version: Version?): String? {
     if (version == null || prefix.find(eid, 0) == null) return null
     return when {
         // @formatter:off
-        version >= Version(36,  7,  2) -> "v2"
-        version >= Version(36,  9,  3) -> "v2.1"
-        version >= Version(36, 17,  4) -> "v2s"
-        version >= Version(36, 17, 39) -> "v3 (beta)"
         version >= Version(36, 18,  5) -> "v3 (final)"
+        version >= Version(36, 17, 39) -> "v3 (beta)"
+        version >= Version(36, 17,  4) -> "v2s"
+        version >= Version(36,  9,  3) -> "v2.1"
+        version >= Version(36,  7,  2) -> "v2"
         // @formatter:on
         else -> null
     }