diff --git a/4coder_default_framework.h b/4coder_default_framework.h
index b1f21546..0e7baac2 100644
--- a/4coder_default_framework.h
+++ b/4coder_default_framework.h
@@ -67,7 +67,7 @@ struct Named_Mapping{
 ////////////////////////////////
 
 static void
-do_gui_sure_to_kill(Application_Links *app, Buffer_Summary *buffer, View_Summary *view);
+do_gui_sure_to_kill(Application_Links *app, Buffer_ID buffer, View_Summary *view);
 
 static void
 do_gui_sure_to_close_4coder(Application_Links *app, View_Summary *view);
diff --git a/4coder_helper.cpp b/4coder_helper.cpp
index 9e521995..105fc562 100644
--- a/4coder_helper.cpp
+++ b/4coder_helper.cpp
@@ -735,7 +735,7 @@ kill_buffer(Application_Links *app, Buffer_Identifier identifier, View_ID gui_vi
     if (result == BufferKillResult_Dirty){
         Buffer_Summary buffer = buffer_identifier_to_buffer_summary(app, identifier, AccessAll);
         View_Summary view = get_view(app, gui_view_id, AccessAll);
-        do_gui_sure_to_kill(app, &buffer, &view);
+        do_gui_sure_to_kill(app, buffer.buffer_id, &view);
     }
     return(result);
 }
diff --git a/4coder_lists.cpp b/4coder_lists.cpp
index a460e727..d471456e 100644
--- a/4coder_lists.cpp
+++ b/4coder_lists.cpp
@@ -683,7 +683,7 @@ activate_confirm_kill(Application_Links *app, Partition *scratch, Heap *heap, Vi
 }
 
 static void
-do_gui_sure_to_kill(Application_Links *app, Buffer_Summary *buffer, View_Summary *view){
+do_gui_sure_to_kill(Application_Links *app, Buffer_ID buffer, View_Summary *view){
     Lister_Fixed_Option options[] = {
         {"(N)o"           , "", "Nn", IntAsPtr(SureToKill_No)  },
         {"(Y)es"          , "", "Yy", IntAsPtr(SureToKill_Yes) },
@@ -692,7 +692,7 @@ do_gui_sure_to_kill(Application_Links *app, Buffer_Summary *buffer, View_Summary
     i32 option_count = sizeof(options)/sizeof(options[0]);
     begin_integrated_lister__with_fixed_options(app, "There are unsaved changes, close anyway?",
                                                 activate_confirm_kill,
-                                                &buffer->buffer_id, sizeof(buffer->buffer_id),
+                                                &buffer, sizeof(buffer),
                                                 options, option_count, default_string_size_estimation,
                                                 view);
 }