FS-5748 --resolve regression from FS-5665 511efc5cf02b68f4d5009142a5d3ae7584325b3d