Fixed possible issue with certain output names.