LPS-48806

Hi Sergio, can you review this fix? thx