add Empty and Block
add Empty and Block, fix bug