Further fix for 4053515.