The current behavior makes it hard to use a joypad with more than 4 axis. Moreover, I own a 6 axis joypad (XBox 360) and a 4 axis (Pro Controller) and I can't see how to use the same map file for both: the buttons are different! I've been using this patch for a while with no regressions. I'd ask for reconsideration.