[TECHNICAL SUPPORT] LPS-33802

Hi Máté,

You have closed my original PR for some reason what you didn't remember. I verified that current master branch still suffers from this, so I rebased and retested my fix before resending the PR to you.

Regards,
Vilmos