diff --git a/main.go b/main.go
index ddef5cc..0737116 100644
--- a/main.go
+++ b/main.go
@@ -121,6 +121,8 @@ func (c *customDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error {
 	_zone = strings.TrimRight(_zone, ".")
 	_key := "\"" + ch.Key + "\""
 
+	fmt.Println("ADD", _zone, _key)
+
 	err = dnsObj.AddRecord("TXT", _zone, _key, false, "")
 	if err != nil {
 		return err
@@ -138,8 +140,11 @@ func (c *customDNSProviderSolver) Present(ch *v1alpha1.ChallengeRequest) error {
 // concurrently.
 func (c *customDNSProviderSolver) CleanUp(ch *v1alpha1.ChallengeRequest) error {
 
+	_addr := strings.TrimRight(ch.ResolvedFQDN, ".")
 	_key := "\"" + ch.Key + "\""
-	_id, err := c.freedns.FindRecord(strings.TrimSuffix(ch.ResolvedZone, "."), "TXT", _key)
+	_id, err := c.freedns.FindRecord(_addr, "TXT", _key)
+
+	fmt.Println("DEL", _addr)
 
 	if _id != "" {
 		err = c.freedns.DeleteRecord(_id)