diff --git a/Sources/EventTapManager.swift b/Sources/EventTapManager.swift
index d5d4abb..5fb297a 100644
--- a/Sources/EventTapManager.swift
+++ b/Sources/EventTapManager.swift
@@ -38,7 +38,14 @@ class EventTapManager {
             if manager.keyMapper.hasMappingFor(keyCode: keyCode) {
                 if let mappedKey = manager.keyMapper.getMappedKey(for: keyCode) {
                     Logger.debug("Remapping: \(keyCode) -> \(mappedKey)")
-                    event.setIntegerValueField(.keyboardEventKeycode, value: mappedKey)
+                    
+                    let newEvent = CGEvent(keyboardEventSource: nil, virtualKey: CGKeyCode(mappedKey), keyDown: type == .keyDown)
+                    if let newEvent = newEvent {
+                        newEvent.flags = event.flags
+                        newEvent.post(tap: .cghidEventTap)
+                    }
+                    
+                    return nil
                 }
             }