Fixed output problems