diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index 467d294fa..4c13944be 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1248,6 +1248,9 @@ def identifyWaf():
     if not conf.identifyWaf:
         return None
 
+    if not kb.wafFunctions:
+        setWafFunctions()
+
     kb.testMode = True
 
     infoMsg = "using WAF scripts to detect "
@@ -1424,3 +1427,6 @@ def checkConnection(suppressOutput=False):
 
 def setVerbosity():  # Cross-linked function
     raise NotImplementedError
+
+def setWafFunctions():  # Cross-linked function
+    raise NotImplementedError
diff --git a/lib/core/option.py b/lib/core/option.py
index f26827c08..fd163f6a8 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -2545,6 +2545,7 @@ def _resolveCrossReferences():
     lib.request.connect.setHTTPHandlers = _setHTTPHandlers
     lib.utils.search.setHTTPHandlers = _setHTTPHandlers
     lib.controller.checks.setVerbosity = setVerbosity
+    lib.controller.checks.setWafFunctions = _setWafFunctions
 
 def initOptions(inputOptions=AttribDict(), overrideOptions=False):
     _setConfAttributes()
diff --git a/lib/core/settings.py b/lib/core/settings.py
index c4643b2ba..4b59dd1f7 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.5.86"
+VERSION = "1.0.5.87"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")