CNAME fix #2