Regression fix #2