diff --git a/Makefile b/Makefile
index 3903125c..40e46a85 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ APPNAME = "Stellar"
 # Application version
 APPVERSION_M = 5
 APPVERSION_N = 3
-APPVERSION_P = 2
+APPVERSION_P = 3
 APPVERSION = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 # Application source files
diff --git a/libstellar/formatter.c b/libstellar/formatter.c
index 96f44200..db925e62 100644
--- a/libstellar/formatter.c
+++ b/libstellar/formatter.c
@@ -2092,6 +2092,7 @@ static bool format_operation_source_for_invoke_host_function_op(formatter_data_t
             : fdata->envelope->tx_details.tx.op_details.invoke_host_function_op
                   .sub_invocations_count;
     if (sub_invocations_count > 0) {
+        formatter_index = 0;
         FORMATTER_CHECK(push_to_formatter_stack(&format_sub_invocation_start))
     } else {
         FORMATTER_CHECK(push_to_formatter_stack(NULL))
@@ -2113,6 +2114,7 @@ static bool format_operation_source_prepare_for_invoke_host_function_op(formatte
                 : fdata->envelope->tx_details.tx.op_details.invoke_host_function_op
                       .sub_invocations_count;
         if (sub_invocations_count > 0) {
+            formatter_index = 0;
             FORMATTER_CHECK(push_to_formatter_stack(&format_sub_invocation_start))
         } else {
             FORMATTER_CHECK(push_to_formatter_stack(NULL))
diff --git a/release-notes.md b/release-notes.md
index 87e43f8a..90d7b60e 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v5.3.3
+
+### Updated
+- Fix bugs.
+
 ## v5.3.2
 
 ### Updated