VALIDATION FIX