Work around change in Python 2.5