Fixing for Python 2.7