[Update] - Validation Fix