Fix broken outputs for heavy commands