bugfix: BlockUtils::expand did more than needed