LPS-49040

Hi Tibor, this is a fix for LPS-49040 from @brunobasto.