Add 3.6 compatibility.