Ajay/Melanie |#3561| Fixing Ft's