Fix issue with using more pieces than given