diff --git a/include/mariadb_rpl.h b/include/mariadb_rpl.h
index b78ce08c..3cd63030 100644
--- a/include/mariadb_rpl.h
+++ b/include/mariadb_rpl.h
@@ -205,7 +205,7 @@ struct st_mariadb_rpl_table_map_event {
   MARIADB_STRING database;
   MARIADB_STRING table;
   unsigned int column_count;
-  char *column_types;
+  MARIADB_STRING column_types;
   MARIADB_STRING metadata;
   char *null_indicator;
 };
diff --git a/libmariadb/mariadb_rpl.c b/libmariadb/mariadb_rpl.c
index 0c852a66..c7dacb5c 100644
--- a/libmariadb/mariadb_rpl.c
+++ b/libmariadb/mariadb_rpl.c
@@ -246,8 +246,10 @@ MARIADB_RPL_EVENT * STDCALL mariadb_rpl_fetch(MARIADB_RPL *rpl, MARIADB_RPL_EVEN
         goto mem_error;
       ev+= len + 1;
       rpl_event->event.table_map.column_count= mysql_net_field_length(&ev);
-      rpl_event->event.table_map.column_types= (char *)ev;
-      ev+= rpl_event->event.table_map.column_count;
+      len= rpl_event->event.table_map.column_count;
+      if (rpl_alloc_string(rpl_event, &rpl_event->event.table_map.column_types, ev, len))
+        goto mem_error;
+      ev+= len;
       len= mysql_net_field_length(&ev);
       if (rpl_alloc_string(rpl_event, &rpl_event->event.table_map.metadata, ev, len))
         goto mem_error;