Fix up output issue