LPS-46828

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