Fix output generator