Fixed for python 2.6