Fixed bug in Picker class