Python 3 support caught up yet again