added global afterSet - corrected