Fix on validators