Another fix for Python 2