Fixup now sorts output