Py2.4/5 fix