Re-fix py2.5 fix