Another attempt at getting site titles right. See #55