Make minor fix to new output code