LPS-46755

Hi Ray, can you take a look to this fix? thanks