Improved backward compatibility.