friend-picker fix