Revert "Revert "Fix --block""

This reverts commit 8b4ddd9797c1ccf628c4225e191ae0ee4cf815f6.