Bugfix for Python 2.x