Fix for validation handling