D 16638/add equal to validator (Not Ready)