And a python 2.6 fix