Fix to new validator method