Fixing cname issue