Fix ordering in output