diff --git a/packages/bonsoir/example/android/app/build.gradle b/packages/bonsoir/example/android/app/build.gradle
index 22f36974..faf5a7f5 100644
--- a/packages/bonsoir/example/android/app/build.gradle
+++ b/packages/bonsoir/example/android/app/build.gradle
@@ -48,7 +48,7 @@ android {
         applicationId "fr.skyost.bonsoir_example"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 19
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/packages/bonsoir_android/android/src/main/kotlin/fr/skyost/bonsoir/discovery/BonsoirServiceDiscovery.kt b/packages/bonsoir_android/android/src/main/kotlin/fr/skyost/bonsoir/discovery/BonsoirServiceDiscovery.kt
index 9cc2f344..5c5510d9 100644
--- a/packages/bonsoir_android/android/src/main/kotlin/fr/skyost/bonsoir/discovery/BonsoirServiceDiscovery.kt
+++ b/packages/bonsoir_android/android/src/main/kotlin/fr/skyost/bonsoir/discovery/BonsoirServiceDiscovery.kt
@@ -87,7 +87,7 @@ class BonsoirServiceDiscovery(
      * @param type The service type.
      */
     private fun findService(name: String, type: String? = null): BonsoirService? {
-        for (service in services) {
+        for (service in ArrayList(services)) {
             if (name == service.name && (type == null || type == service.type)) {
                 return service
             }