Fix for Win/Py2.7 and Linux/Py3.2