Update for Python 2.7