Updates break Macro execution

Updates break Macro execution => Solution(s):