Making a macro robust (legacy package)
