Fixed bug with ObjectPicker