Added fix for sections not including all blocks