Bug fix on block