Partially fix #2667
1 file changed