Piece selection now picks correct piece