diff --git a/pkg/nameservers/nameservers.go b/pkg/nameservers/nameservers.go
index 9cc2774ec..9ae309239 100644
--- a/pkg/nameservers/nameservers.go
+++ b/pkg/nameservers/nameservers.go
@@ -32,6 +32,10 @@ func DetermineNameservers(dc *models.DomainConfig) ([]*models.Nameserver, error)
 		}
 		for i := 0; i < take; i++ {
 			nss[i].Name = strings.TrimRight(nss[i].Name, ".")
+			// FIXME(tlim): Rather than correct broken providers, we should print
+			// a warning that the provider should be updated to store the FQDN
+			// with no trailing dot.  See also providers/namedotcom/nameservers.go
+			// Bug https://github.com/StackExchange/dnscontrol/issues/491
 			ns = append(ns, nss[i])
 		}
 	}
diff --git a/providers/namedotcom/nameservers.go b/providers/namedotcom/nameservers.go
index 9798d85d6..3d8545c0e 100644
--- a/providers/namedotcom/nameservers.go
+++ b/providers/namedotcom/nameservers.go
@@ -55,6 +55,9 @@ func (n *NameCom) GetRegistrarCorrections(dc *models.DomainConfig) ([]*models.Co
 	expected := []string{}
 	for _, ns := range dc.Nameservers {
 		expected = append(expected, ns.Name)
+		// FIXME(tlim): This should store a FQDN with no trailing ".".
+		// See pkg/nameservers/nameservers.go for details.
+		// Bug https://github.com/StackExchange/dnscontrol/issues/491
 	}
 	sort.Strings(expected)
 	expectedNameservers := strings.Join(expected, ",")