fix common.blocks