Fix picker implementation