Fix picking class