Pooja | #3671 | Fixing FTs