Fix to support Python 2.7