diff --git a/package.json b/package.json
index ca6fd5b..3b366e9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro-color-scheme",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Perfect dark mode for Astro in few lines of code. Theme Toggle for Dark, Light & Auto (system)",
   "type": "module",
   "exports": {
@@ -20,4 +20,4 @@
   "keywords": ["astro", "astro-component", "themes", "color-scheme", "dark", "dark-mode", "light", "system", "auto"],
   "author": "Surjith S M",
   "license": "MIT"
-}
\ No newline at end of file
+}
diff --git a/src/ThemeSwitch.astro b/src/ThemeSwitch.astro
index 19fbffb..3057223 100644
--- a/src/ThemeSwitch.astro
+++ b/src/ThemeSwitch.astro
@@ -72,7 +72,7 @@ const { strategy, defaultTheme, as: Element = "span" } = Astro.props;
   switch (strategy) {
     case "button":
       setupThemeSwitch("button", "click", (event) => {
-        const button = event.target;
+        const button = event.currentTarget;
         const settheme = button.value === "dark" ? "light" : "dark";
         button.value = settheme;
         updateTheme(settheme);
@@ -80,13 +80,13 @@ const { strategy, defaultTheme, as: Element = "span" } = Astro.props;
       break;
     case "select":
       setupThemeSwitch("select", "change", (event) => {
-        const select = event.target;
+        const select = event.currentTarget;
         updateTheme(select.value);
       });
       break;
     case "checkbox":
       setupThemeSwitch("input", "change", (event) => {
-        const checkbox = event.target;
+        const checkbox = event.currentTarget;
         const settheme = checkbox.value === "dark" ? "light" : "dark";
         checkbox.value = settheme;
         updateTheme(settheme);
@@ -94,7 +94,7 @@ const { strategy, defaultTheme, as: Element = "span" } = Astro.props;
       break;
     case "radio":
       setupThemeSwitch("form", "click", (event) => {
-        updateTheme(event.target.value);
+        updateTheme(event.currentTarget.value);
       });
       break;
     default: