Fix backwards compatibility.