Output order fix