Fixed for Python 2.6