A fix for bug #7526.
This fixes #7528.