CON-113 | Falat error fix - Change after Code review