Improved compatibility with python 2.6