Nvidia Shield TV Joystick support

Hey Guys,
Since I’ve upgraded to kodi 17, my controllers arent detected as joysticks anymore but instead detected as keyboard or at least thas what I think.
When inspecting the debug logs i found the following entries

Code:
21:56:32.747 T:138555753536   DEBUG: OnKey: down (0xf081) pressed, action is Down
21:56:32.847 T:138555753536   DEBUG: Keyboard: scancode: 0x14, sym: 0x0112, unicode: 0x0000, modifier: 0x0
21:56:33.128 T:138555753536   DEBUG: Keyboard: scancode: 0x17, sym: 0x000d, unicode: 0x0000, modifier: 0x0
21:56:33.231 T:138555753536   DEBUG: OnKey: return (0xf00d) pressed, action is Select
21:56:33.231 T:138555753536   DEBUG: Keyboard: scancode: 0x17, sym: 0x000d, unicode: 0x0000, modifier: 0x0
21:56:34.612 T:138555753536   DEBUG: Keyboard: scancode: 0x3e, sym: 0x0020, unicode: 0x0020, modifier: 0x0
21:56:34.714 T:138555753536   DEBUG: Keyboard: scancode: 0x3e, sym: 0x0020, unicode: 0x0020, modifier: 0x0
21:56:44.030 T:138555753536   DEBUG: Keyboard: scancode: 0x16, sym: 0x0113, unicode: 0x0000, modifier: 0x0
21:56:44.030 T:138555753536   DEBUG: OnKey: right (0xf083) pressed, action is Right

Some of my buttons have the same functionality for instance A Left stick and Right stick all act like Select
While both X and B act as back.
The shoulder buttons act as pageup and pagedown.

Is there a way i can restore the functionality as it was in Kodi 16 where is detected as a joystick and I can configure my keymaping via joystick ids with buttons and hat ids instead of a crippled keyboard (emulation?)?