diff --git a/OscCommentMacroListener.py b/OscCommentMacroListener.py
index b373636..2e691da 100644
--- a/OscCommentMacroListener.py
+++ b/OscCommentMacroListener.py
@@ -185,9 +185,9 @@ class OscCommentMacroListener(CommentMacroListener):
         self.server = server
 
     def enterMacro(self, ctx: CommentMacroParser.MacroContext):
-        ctx.targets = []
-        ctx.number = None
         ctx.device = None
+        ctx.number = None
+        ctx.targets = []
         ctx.time = None
 
     def exitMacro(self, ctx: CommentMacroParser.MacroContext):