Fix (hopefully) python 2.5 compatibility (again)