Add super to fix category macros