Match old format a bit better