Fixed for python 2.7