Fix picker after API change