quick fixup on macro