Fix for #84 and #63
Merge pull request #85 from skywinder/consistent-picker-fix

Fix for #84 and #63