Fixed to work with python 3.4