Fixed Validation Issue