This fixes bug #7499.