Fix output contexts