diff --git a/pyste/install/setup.py b/pyste/install/setup.py
index 0be38eb8..8d4e86aa 100644
--- a/pyste/install/setup.py
+++ b/pyste/install/setup.py
@@ -4,7 +4,7 @@ from distutils.core import setup
 import sys
 
 setup (name              = "Pyste",
-       version           = "0.9.7",
+       version           = "0.9.8",
        description       = "Pyste - Python Semi-Automatic Exporter",
        maintainer        = "Bruno da Silva de Oliveira",
        maintainer_email  = "nicodemus@globalite.com.br",
diff --git a/pyste/src/Pyste/pyste.py b/pyste/src/Pyste/pyste.py
index 2b4b38fd..4e940483 100644
--- a/pyste/src/Pyste/pyste.py
+++ b/pyste/src/Pyste/pyste.py
@@ -39,7 +39,7 @@ from policies import *
 from CppParser import CppParser, CppParserError
 import time
 
-__VERSION__ = '0.9.7'
+__VERSION__ = '0.9.8'
 
 def RecursiveIncludes(include):
     'Return a list containg the include dir and all its subdirectories'
diff --git a/pyste/src/Pyste/utils.py b/pyste/src/Pyste/utils.py
index 0943762b..82cf941a 100644
--- a/pyste/src/Pyste/utils.py
+++ b/pyste/src/Pyste/utils.py
@@ -20,6 +20,8 @@ _valid_chars = dict(zip(_valid_chars, _valid_chars))
 
 def makeid(name):
     'Returns the name as a valid identifier'
+    if type(name) != str:
+        print type(name), name
     newname = []
     for char in name:
         if char not in _valid_chars:
diff --git a/pyste/tests/test_all.py b/pyste/tests/test_all.py
index cb276358..e9cdd381 100644
--- a/pyste/tests/test_all.py
+++ b/pyste/tests/test_all.py
@@ -104,7 +104,7 @@ def main(multiple, module=None):
         os.system('python %sUT.py' % modules[0])
     else:
         run_tests()
-    cleanup() 
+    #cleanup() 
 
     
 def get_modules():
@@ -118,7 +118,7 @@ if __name__ == '__main__':
     else:
         module = None
     try:
-        #main('--multiple', module)
-        main('', module)
+        main('--multiple', module)
+        #main('', module)
     except RuntimeError, e:
         print e