This should fix #7679.