Fix for macro