fix piece selection