Fix numpad keys

Fix issue: #2101 partially.
This doesn't fix the minus sign issue as described.