@craggus2000 Thanks for reporting back. Have fun. Please edit your first post and add in the something like [solved], so it is more likely to be picked up by search engines.
Your question made me updating my hint from last year on that topic.
Errata: 13 buttons do have 4 for the axis and 9 for the push buttons. :-D I was in a hurry.