Dc/Melanie |#4045| Fixing Ft