Heri : #1759: Fixing FT