fix for the validation issue