Fix pick

Change-Id: I569c4d8b1ebe00e30ee6583f61d4790e543f60ae