diff --git a/contrib/telega-live-location.el b/contrib/telega-live-location.el
index 5e3edd5..32d509c 100644
--- a/contrib/telega-live-location.el
+++ b/contrib/telega-live-location.el
@@ -98,8 +98,9 @@ Return live location from geo module, otherwise fallback to
         ;; For `C-c C-a live-geo-location RET'
         (unless (assoc "live-geo-location" telega-chat-attach-commands)
           (add-to-list 'telega-chat-attach-commands
-                       (list "live-geo-location" #'geo-last-location
-                             #'telega-live-location-attach-live-geo-location)
+                       '("live-geo-location"
+                         (eval (geo-last-location))
+                         #'telega-live-location-attach-live-geo-location)
                        'append))
 
         ;; Update location on start
diff --git a/contrib/telega-mnz.el b/contrib/telega-mnz.el
index 5a4e581..4b8e1fb 100644
--- a/contrib/telega-mnz.el
+++ b/contrib/telega-mnz.el
@@ -512,7 +512,7 @@ ARG is passed directly to function `telega-mnz-mode'."
 ;; For `C-c C-a code RET'
 (unless (assoc "code" telega-chat-attach-commands)
   (add-to-list 'telega-chat-attach-commands
-               (list "code" nil #'telega-mnz-chatbuf-attach-code) 'append))
+               '("code" (return t) #'telega-mnz-chatbuf-attach-code) 'append))
 
 (provide 'telega-mnz)