Improve compatibility.