Manual fix for Python 2