macros: fix internal org