Fix for Python 2.x support