Fix for 24.4 compatibility.