Fix multiblock issue