fix return macros