:: commit 6d6c8e084bd7b5121cadc6ae66ac20a3b2cf36fe

diff --git a/common/protos/limine.c b/common/protos/limine.c
index 9a02c459..6b44253f 100644
--- a/common/protos/limine.c
+++ b/common/protos/limine.c
@@ -117,6 +117,14 @@ extern uint64_t stivale2_term_write_ptr;
 void stivale2_term_callback(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
 #endif
 
+static uint64_t term_arg;
+static void (*actual_callback)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+
+static void callback_shim(struct term_context *ctx, uint64_t a, uint64_t b, uint64_t c, uint64_t d) {
+    (void)ctx;
+    actual_callback(term_arg, a, b, c, d);
+}
+
 static void term_write_shim(uint64_t context, uint64_t buf, uint64_t count) {
     (void)context;
     _term_write(buf, count);
@@ -497,14 +505,18 @@ FEAT_START
     fb = fbinfo;
 
     if (terminal_request->callback != 0) {
+        term->callback = callback_shim;
+
 #if defined (__i386__)
-        term->callback = (void *)stivale2_term_callback;
+        actual_callback = (void *)stivale2_term_callback;
         stivale2_term_callback_ptr = terminal_request->callback;
 #elif defined (__x86_64__)
-        term->callback = (void *)terminal_request->callback;
+        actual_callback = (void *)terminal_request->callback;
 #endif
     }
 
+    term_arg = reported_addr(terminal);
+
 #if defined (__i386__)
     if (stivale2_rt_stack == NULL) {
         stivale2_rt_stack = ext_mem_alloc(16384) + 16384;
diff --git a/common/protos/stivale2.c b/common/protos/stivale2.c
index 1526ac94..e9ede2ea 100644
--- a/common/protos/stivale2.c
+++ b/common/protos/stivale2.c
@@ -83,6 +83,13 @@ uint64_t stivale2_term_write_ptr = 0;
 void stivale2_term_callback(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
 #endif
 
+static void (*actual_callback)(uint64_t, uint64_t, uint64_t, uint64_t);
+
+static void callback_shim(struct term_context *ctx, uint64_t a, uint64_t b, uint64_t c, uint64_t d) {
+    (void)ctx;
+    actual_callback(a, b, c, d);
+}
+
 noreturn void stivale2_load(char *config, char *cmdline) {
     char *depr_warn = config_get_value(config, 0, "DEPRECATION_WARNING");
     if (depr_warn == NULL || strcmp(depr_warn, "no") != 0) {
@@ -583,11 +590,13 @@ failed_to_load_header_section:
             // We provide callback
             tag->flags |= (1 << 2);
             if (terminal_hdr_tag->callback != 0) {
+                term->callback = callback_shim;
+
 #if defined (__i386__)
-                term->callback = (void *)stivale2_term_callback;
+                actual_callback = (void *)stivale2_term_callback;
                 stivale2_term_callback_ptr = terminal_hdr_tag->callback;
 #elif defined (__x86_64__)
-                term->callback = (void *)terminal_hdr_tag->callback;
+                actual_callback = (void *)terminal_hdr_tag->callback;
 #endif
             }
         }