Fixed compatibility with Python 3.8-3.9