Possible fix for Python2 failing