Fix for Python2