LPS-46828

Hi Sergio, @JorgeFerrer and me reviewed this fix, can you take a look? thanks