Additional tweak to fix last block.