Fix further validation issue