@kaustubh-d  Fixed.
@adamedx please review the changes. Thanks.