Merge pull request #431 from YorkShen/bugfix/picker

Update picker