Validation Fix

Validation Fix