This fixes #7922.
A fix for bug #7913.