Revert "Revert "Fix --block""

This reverts commit 839325d3b321f0c4987f5b66e848ba14012572c3.