This fixes #7432.