Fix for b1b5087.