Fix for Python 2.X