Regression fix #587