Security fix for validator