Fix regular commands accepting blocks