--- a/targets/plc_debug.c	Fri Mar 13 17:19:58 2015 +0100
+++ b/targets/plc_debug.c	Fri Mar 13 22:36:52 2015 +0100
@@ -111,6 +111,7 @@
 }
 
 extern int CheckRetainBuffer(void);
+extern void InitRetain(void);
 
 void __init_debug(void)
 {
@@ -118,6 +119,7 @@
     buffer_cursor = debug_buffer;
     retain_offset = 0;
     buffer_state = BUFFER_FREE;
+    InitRetain();
     /* Iterate over all variables to fill debug buffer */
     if(CheckRetainBuffer())
     	__for_each_variable_do(RemindIterator);
@@ -125,6 +127,7 @@
 }
 
 extern void InitiateDebugTransfer(void);
+extern void CleanupRetain(void);
 
 extern unsigned long __tick;
 
@@ -132,6 +135,7 @@
 {
     buffer_cursor = debug_buffer;
     InitiateDebugTransfer();
+    CleanupRetain();
 }
 
 void __retrieve_debug(void)