diff --git a/events.c b/events.c
index f8045ff..a2349bd 100644
--- a/events.c
+++ b/events.c
@@ -94,7 +94,7 @@
             events[i]->jsnum=-1;
             events[i]->mapped=0;
             events[i]->duplicate=0;
-            
+
             for (d=0; d<i; d++) {
                 if (events[d] && events[d]->vendor==id.vendor && events[d]->product==id.product) {
                     events[i]->duplicate = events[i]->duplicate + 1;
@@ -430,8 +430,13 @@
     for (i=0; i<MAX_EVENTS; i++) {
         if (events[i])
             if ((events[i]->vendor==axis->vendor)&&
-               (events[i]->product==axis->product))
-                mapper=events[i];
+               (events[i]->product==axis->product)) {
+                if (axis->joystick != 255) {
+                    if (axis->joystick == events[i]->duplicate) mapper=events[i];
+                } else {
+                    mapper=events[i];
+                }
+            }
     }
 
     if (mapper==NULL) return;