Re-instated a Python 3 fix