Fix for validation