LPS-45012 Fix bug