This fixes bug #8149.