fix issues for validation