adjust to changed macros