Fixing to work on Python <2.5