Scoreboard stat.useItem.map doesn't work correctly

Let me start of by saying that i know this bug has thousands of duplicates, but this bug has been here since 1.7 and you still havent fixed it. Since this is one of the few "right-click" detectable items, it really annoys mapmakers like me. Please fix it.

How to do this bug, if you dont know yet:
1. Create scoreboard objective:"/scoreboard objectives add Map stat.useItem.minecraft.map"
2. Get a single piece of map in your hand.
3. Right click map.
4. Watch how the scoreboard doesnt increase.

This only bug only happens if you have ONLY 1 map in your hand, if you have multiple the csore increases just fine.
Please fix it.