Validity - Fix (Implementation was modified to be less variant).