Important fix for python 2.6 support