Heri | #1821: Fixing FT