Fix backward compatibility.