Fixed bug where pieces may not be removed correctly