Fix  validation issue