diff --git a/prboom2/src/p_saveg.c b/prboom2/src/p_saveg.c
index 467dc68ce..f928b410d 100644
--- a/prboom2/src/p_saveg.c
+++ b/prboom2/src/p_saveg.c
@@ -1118,10 +1118,10 @@ void P_ArchiveThinkers(void) {
   {
     if (buttonlist[i].btimer != 0)
     {
+      button_t *button;
       P_SAVE_BYTE(tc_button);
-      button_t button = buttonlist[i];
-      button.line = (line_t *)(button.line - lines);
-      P_SAVE_TYPE(&button, button_t);
+      P_SAVE_TYPE_REF(&buttonlist[i], button, button_t);
+      button->line = (line_t *)(button->line - lines);
     }
   }