diff --git a/pynput_service.py b/pynput_service.py
index c51e9a524..5aca57986 100644
--- a/pynput_service.py
+++ b/pynput_service.py
@@ -145,7 +145,11 @@ class MyController(Controller):
             or (keycode_flag == False and keycode == list(keycode_set)[0] and len(keycode_set) == 1):
             deakkey_chr = str(key).replace("'", '')
             keysym = DEAD_KEYS[deakkey_chr]
-            keycode, shift_state = self.keyboard_mapping[keysym][0]
+            # shift_state = 0
+            keycode, shift_state = list(
+                filter(lambda x: x[1] == 0,
+                       self.keyboard_mapping[keysym])
+            )[0]
 
         # If the key has a virtual key code, use that immediately with
         # fake_input; fake input,being an X server extension, has access to
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 5917314ca..8aa0bccb1 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -276,7 +276,7 @@ impl Handler {
                     KeyRelease(k) => (k, 0),
                     _ => return,
                 };
-                log::debug!("{:?}", key);
+                log::debug!("{:?}", key);a
                 let alt = get_key_state(enigo::Key::Alt);
                 #[cfg(windows)]
                 let ctrl = {