diff --git a/BmwDeepObd/ActivityCommon.cs b/BmwDeepObd/ActivityCommon.cs
index a295066b3..1317b0c47 100644
--- a/BmwDeepObd/ActivityCommon.cs
+++ b/BmwDeepObd/ActivityCommon.cs
@@ -10912,13 +10912,13 @@ public static string GetAssetEcuFilename()
 
             try
             {
-                Regex regex = new Regex(@"^Ecu.*\.bin$", RegexOptions.IgnoreCase);
                 AssetManager assets = GetPackageContext()?.Assets;
                 if (assets != null)
                 {
                     string[] assetFiles = assets.List(string.Empty);
                     if (assetFiles != null)
                     {
+                        Regex regex = new Regex(@"^Ecu.*\.bin$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
                         foreach (string fileName in assetFiles)
                         {
                             if (regex.IsMatch(fileName))
diff --git a/BmwDeepObd/AndroidManifest.xml b/BmwDeepObd/AndroidManifest.xml
index 52c6dc5a6..c7f6e8580 100644
--- a/BmwDeepObd/AndroidManifest.xml
+++ b/BmwDeepObd/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.3.240" package="de.holeschak.bmw_deep_obd" android:installLocation="auto" android:versionCode="541">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.3.241" package="de.holeschak.bmw_deep_obd" android:installLocation="auto" android:versionCode="542">
 	<application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:theme="@style/MyTheme" android:windowSoftInputMode="stateHidden" android:hasFragileUserData="true" android:fullBackupContent="@xml/auto_backup_rules" android:dataExtractionRules="@xml/backup_rules">
 		<provider android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}.fileprovider" android:exported="false" android:grantUriPermissions="true">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
diff --git a/BmwDeepObd/MainActivity.cs b/BmwDeepObd/MainActivity.cs
index 24504f9e2..c19b94a96 100644
--- a/BmwDeepObd/MainActivity.cs
+++ b/BmwDeepObd/MainActivity.cs
@@ -6463,9 +6463,10 @@ private bool ExtractSampleFiles(bool force = false)
                 string[] assetFiles = assets.List(string.Empty);
                 if (assetFiles != null)
                 {
+                    Regex regex = new Regex(@"^Sample.*\.zip$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
                     foreach (string fileName in assetFiles)
                     {
-                        if (fileName.EndsWith("Sample.zip", StringComparison.OrdinalIgnoreCase))
+                        if (regex.IsMatch(fileName))
                         {
                             resourceName = fileName;
                             break;