Mihir | Fixing defect failing the functional tests