adapted to new macro name