Regression fix #4837