Fix for validator?