Fix from iif-main: output file name in combination with outputstream