[#65718402] Nicer output