Fix for 24.2.