Tweak to run with python3