LPS-33252

LPS-33252 - Fix for the issue