Another try at PY3 fix.