fix selector for macros with new structure