Hack to fix for python2.6