CNAME fix #3