fixed duplication of blocks