LPS-34283 Fix regression