LPS-45537 Fix a detected issue