This fixes #7756.