See if this fixes compatibility.