FS-5634 --resolve this patch should fix it but comment it out instead in the old version to get the same effect