Fixed choosing pieces

Signed-off-by: ZaighumJ <zaighumjaffri@gmail.com>