CFY-1625 py26 compatibility