Corrected 'retset' macro