LPS-48136 Fix similar cases