One more step towards python3