apply Loic's changes only in python3 for extra safety