Ajay/Ashwin | #3360 | Fixing ft