Merge
Fix for 0.24.2 compatibility.