Fixed Py2 vs. Py3 issue