diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5f5c6417..56b85f44 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,9 @@
 ---
 name: Bug report
 about: "help us squat that \U0001FAB3!"
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: ""
+assignees: ""
 ---
 
 **Describe the bug**
diff --git a/SUPPORT.md b/SUPPORT.md
index 09250171..2b23cb72 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -1,7 +1,7 @@
 # Commercial Support
 
-The recommended way of obtaining commercial support for `wdi5` is via [GitHub Sponsors](https://docs.github.com/en/sponsors), providing process- and financial-flows without bureaucratic hassles.   
-These are the companies and individuals offering commercial support for `wdi5`:  
+The recommended way of obtaining commercial support for `wdi5` is via [GitHub Sponsors](https://docs.github.com/en/sponsors), providing process- and financial-flows without bureaucratic hassles.  
+These are the companies and individuals offering commercial support for `wdi5`:
 
 - [j&s-soft](https://github.com/sponsors/js-soft)
 
diff --git a/src/lib/wdi5-bridge.ts b/src/lib/wdi5-bridge.ts
index 40f5dbe3..d63c7fe2 100644
--- a/src/lib/wdi5-bridge.ts
+++ b/src/lib/wdi5-bridge.ts
@@ -121,7 +121,9 @@ export async function injectUI5(config: wdi5Config, browserInstance) {
     await clientSide_injectTools(browserInstance) // helpers for wdi5 browser scope
     result = result && (await clientSide_injectUI5(config, waitForUI5Timeout, browserInstance))
 
-    if (browserInstance._controls.length > 0) {
+    // we are not using _controls as an array, we are using it as an object. That's why the length property
+    // is not updated right away: https://stackoverflow.com/a/4424026
+    if (Object.keys(browserInstance._controls).length > 0) {
         Logger.info("invalidating control map!")
         browserInstance._controls = []
     }