Fix validation (final)