Fix to validation error as per QA document