Fix backward-compatibility.