Backport fix for buglet from py3k