Piece constructor edge case fix