diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index c7f5e3f6d..eac4320b5 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -208,8 +208,7 @@ def start():
             if conf.multipleTargets:
                 hostCount += 1
                 if conf.forms:
-                    name = kb.formNames[(targetUrl, targetMethod, targetData, targetCookie)]
-                    message = "[#%d] %s:\n%s %s" % (hostCount, "form%s" % (" '%s'" % name if name else ""), conf.method or HTTPMETHOD.GET, targetUrl)
+                    message = "[#%d] form:\n%s %s" % (hostCount, conf.method or HTTPMETHOD.GET, targetUrl)
                 else:
                     message = "%s %d:\n%s %s" % ("url", hostCount, conf.method or HTTPMETHOD.GET, targetUrl)
 
diff --git a/lib/core/option.py b/lib/core/option.py
index 3f7b2a116..d178ea371 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -373,7 +373,7 @@ def __findPageForms():
 
             target = (url, method, data, conf.cookie)
             kb.targetUrls.add(target)
-            kb.formNames[target] = form.name
+            kb.formNames.append(target)
     else:
         errMsg  = "there were no forms found at a given target url"
         raise sqlmapGenericException, errMsg
@@ -1142,7 +1142,7 @@ def __setKnowledgeBaseAttributes():
     kb.dep             = None
     kb.docRoot         = None
     kb.dynamicMarkings = []
-    kb.formNames       = advancedDict()
+    kb.formNames       = []
     kb.headersCount    = 0
     kb.headersFp       = {}
     kb.hintValue       = None