removed superfluous macro and check