#6501: Get the titles right.