Fix picking