Fix Validation issue

Fix Validation Issue take 2