LPS-43042 Fix regression