Fix picking problem