diff --git a/sim/L2_Fibonacci_test1.do b/sim/L2_Fibonacci_test1.do
index bcf5f8e..e29572e 100644
--- a/sim/L2_Fibonacci_test1.do
+++ b/sim/L2_Fibonacci_test1.do
@@ -125,8 +125,20 @@ add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_inst/res
 add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_inst/result_seq_ack
 add wave -noupdate -radix unsigned /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_inst/result_seq_r
 add wave -noupdate -radix unsigned /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_inst/result_seq_w
+add wave -noupdate -divider ACTION_SERVER
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/stage
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/cnt
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/data_available_g
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/data_available_r
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/data_available_c
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_done
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_start
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_opcode
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_stage
+add wave -noupdate /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_cnt
+add wave -noupdate -radix hexadecimal -childformat {{/l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.addr -radix unsigned} {/l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.goal_id -radix hexadecimal} {/l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.stamp -radix unsigned} {/l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.deadline -radix unsigned} {/l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.res_ind -radix unsigned} {/l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.state -radix GOAL_STATUS}} -subitemconfig {/l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.addr {-radix unsigned} /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.goal_id {-radix hexadecimal} /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.stamp {-radix unsigned} /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.deadline {-radix unsigned} /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.res_ind {-radix unsigned} /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data.state {-radix GOAL_STATUS}} /l2_fibonacci_ros_action_test1/server_inst/Fibonacci_ros_action_server_inst/action_server_inst/mem_data
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {488675000 ps} 0}
+WaveRestoreCursors {{Cursor 1} {455175000 ps} 0}
 quietly wave cursor active 1
 configure wave -namecolwidth 182
 configure wave -valuecolwidth 220
@@ -142,4 +154,4 @@ configure wave -griddelta 40
 configure wave -timeline 0
 configure wave -timelineunits ns
 update
-WaveRestoreZoom {494011230 ps} {494939270 ps}
+WaveRestoreZoom {456474256 ps} {457402296 ps}
diff --git a/src/ros2/Tests/Fibonacci.vhd b/src/ros2/Tests/Fibonacci.vhd
index cfca531..1989fe6 100644
--- a/src/ros2/Tests/Fibonacci.vhd
+++ b/src/ros2/Tests/Fibonacci.vhd
@@ -168,6 +168,7 @@ begin
                             assert (return_code = ROS_RET_OK) severity FAILURE;
                             stage_next  <= INITIALIZE_EXECUTION;
                             cnt_next    <= 0;
+                            i_next      <= (others => '0');
                         end if;
                     when others =>
                         null;