And a python3 fix