Fixed regression on Python 2.6