Another change to maintain backwards compatibility with Python 3