Fixed a bug with picker