Regression fix #2304