Fix output for multiple output variables