diff --git a/doc/THANKS b/doc/THANKS
index 0da9d1bfa..2aaac8c83 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -409,7 +409,7 @@ james <james@ev6.net>
     for reporting a bug
 
 m4l1c3 <malice.anon@gmail.com>
-    for reporting a minor bug
+    for reporting a few bugs
 
 mariano <marianoso@gmail.com>
     for reporting a bug
diff --git a/lib/core/common.py b/lib/core/common.py
index 6322e5e20..15c37e7fa 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1541,18 +1541,18 @@ def longestCommonPrefix(*sequences):
 def commonFinderOnly(initial, sequence):
     return longestCommonPrefix(*filter(lambda x: x.startswith(initial), sequence))
 
-def getCurrentThreadID():
-    return threading.currentThread().ident
+def getCurrentThreadUID():
+    return hash(threading.currentThread())
 
 def getCurrentThreadData():
     """
     Returns current thread's dependent data
     """
 
-    threadID = getCurrentThreadID()
-    if threadID not in kb.threadData:
-        kb.threadData[threadID] = ThreadData()
-    return kb.threadData[threadID]
+    threadUID = getCurrentThreadUID()
+    if threadUID not in kb.threadData:
+        kb.threadData[threadUID] = ThreadData()
+    return kb.threadData[threadUID]
 
 def pushValue(value):
     """