Fix output order