Bug fix for Python 2.6 compatibility