I know that this bug is already fixed in new versions of FS

But I would not like to update FS version now and looking for some workaround.

Any advice ?

Thanks.