diff --git a/mwclient/client.py b/mwclient/client.py
index d4e1266a1c51a3d04178ea8d0fae4658b5fe061f..8e048f5d63166c640d1a4a5da6ac38aadc54232a 100644
--- a/mwclient/client.py
+++ b/mwclient/client.py
@@ -43,7 +43,7 @@ def parse_timestamp(t):
 class WaitToken(object):
 
     def __init__(self):
-        self.id = '%x' % random.randint(0, sys.maxint)
+        self.id = '%032x' % random.getrandbits(128)
 
     def __hash__(self):
         return hash(self.id)