Make compatible with Python 3 again