Fix picker to always pick like a champ