Fix: 3.4.4 & 3.4.5 compatibility.