Fix HyperBlock and CleanBlock
fix CleanBlock