adaption to new lua macros