Improved cross-version compatibility.