Regression fix for LC 7 support