Fix for 6612.