Fix #1051
Fix #1052
Merge pull request #1057 from xxMUROxx/hotfix/NumericUpDown

Hotfix/numeric up down