fix definition of WHom, close #597