LPS-48138

Hey Hugo,

If you're ok with this fix, can you send it through Eduardo Lundgren?

Thanks.