More D1.6 compatibility.