Regression fix for the previous version