Fixed for py2k