fix for macro