Fixed CBA Macros