Fix for Numberpicker

Also see Numberpicker control