fix for validator