Re #7360 Fix problem with output when no output dir specified